bitkeeper revision 1.1159.192.3 (41a5f022GBi9_4NENr9ydoPoqjQhRA)
authormafetter@fleming.research <mafetter@fleming.research>
Thu, 25 Nov 2004 14:45:54 +0000 (14:45 +0000)
committermafetter@fleming.research <mafetter@fleming.research>
Thu, 25 Nov 2004 14:45:54 +0000 (14:45 +0000)
Merge maf46@ssh-relay1.cl.cam.ac.uk:/usr/groups/netos/xeno/BK/xen-2.0-testing.bk
into fleming.research:/scratch/fleming/mafetter/foo


Trivial merge